Revision: tlasrc--devel--0.2--patch-31
Archive: aaron.bentley@utoronto.ca--tla-2004
Creator: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Sun Nov 21 21:31:13 EST 2004
Standard-date: 2004-11-22 02:31:13 GMT
Modified-files: libarch/apply-changeset.c
    tests/test-star-merge.sh
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-31
Summary: Fixed diff3 --binary bug

Changes intended to improve win32 compatibility caused diff3 to be invoked
with --binary, when it takes no such parameter.  This broke 
star-merge --three-way

This patch reverses the change, and adds a star-merge --three-way test case.
